Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sentry Laptops In vendors #295

Merged
merged 17 commits into from
Jul 22, 2024
Merged

Conversation

KoishiVibe
Copy link
Contributor

@KoishiVibe KoishiVibe commented Jun 13, 2024

Summary

  • sentry laptops now in vendors.
  • some of the computer alert text has been changed to seem more mechanical and 'efficient'. future pr
  • lieutenant's headset now has sentry integration by default, since he doesn't have them on cameras... yet.

@KoishiVibe KoishiVibe marked this pull request as ready for review June 13, 2024 19:51
@DexterDude
Copy link
Contributor

I do like Platoon Commander's getting sentry radio though, makes them more useful in a base defense situation and giving the PlatCo more things to do and more ways to assist their platoon is neat.

@KoishiVibe
Copy link
Contributor Author

I do like Platoon Commander's getting sentry radio though, makes them more useful in a base defense situation and giving the PlatCo more things to do and more ways to assist their platoon is neat.

tbh it sa lazyfix for not having overwatch access to sentry cameras linked up or not having a common marine sentry band for overwatch, but...
c'est la vie.

code/modules/defenses/sentry_computer.dm Outdated Show resolved Hide resolved
code/modules/defenses/sentry_computer.dm Outdated Show resolved Hide resolved
code/modules/defenses/sentry_computer.dm Outdated Show resolved Hide resolved
code/modules/defenses/sentry_computer.dm Outdated Show resolved Hide resolved
code/datums/fluff_emails.dm Outdated Show resolved Hide resolved
@AndroBetel AndroBetel marked this pull request as draft June 16, 2024 23:26
@KoishiVibe KoishiVibe marked this pull request as ready for review June 22, 2024 06:28
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@Doubleumc Doubleumc dismissed DexterDude’s stale review July 22, 2024 21:09

All issues resolved, discussed in Discord

@Doubleumc Doubleumc merged commit a23e097 into cmss13-devs:master Jul 22, 2024
35 checks passed
@KoishiVibe KoishiVibe deleted the sentry-integration branch July 24, 2024 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants